]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
loginDialog: Pass-through UserWidget's label-actor
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 6 Mar 2015 15:56:11 +0000 (16:56 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Fri, 6 Mar 2015 16:24:13 +0000 (17:24 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=729603

js/gdm/loginDialog.js
js/ui/userWidget.js

index b5a5c56e52853a4bd1a8683a69dc8e388aa22880..ce569bfdb5a4700e109fb5a6c6c8ffb9018fe20e 100644 (file)
@@ -22,6 +22,7 @@ const Clutter = imports.gi.Clutter;
 const Gdm = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
@@ -71,6 +72,9 @@ const UserListItem = new Lang.Class({
         this._userWidget = new UserWidget.UserWidget(this.user);
         layout.add(this._userWidget.actor);
 
+        this._userWidget.actor.bind_property('label-actor', this.actor, 'label-actor',
+                                             GObject.BindingFlags.SYNC_CREATE);
+
         this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator',
                                                  scale_x: 0 });
         layout.add(this._timedLoginIndicator);
index 314aae0cea15272081429472c58b2843b723841c..5286ad14eab7273177e7993b3fec3e7478ef5c52 100644 (file)
@@ -6,6 +6,7 @@ const Clutter = imports.gi.Clutter;
 const AccountsService = imports.gi.AccountsService;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
@@ -117,6 +118,7 @@ const UserWidgetLabel = new Lang.Class({
             this._currentLabel = this._realNameLabel;
         else
             this._currentLabel = this._userNameLabel;
+        this.label_actor = this._currentLabel;
 
         let childBox = new Clutter.ActorBox();
         childBox.x1 = 0;
@@ -158,6 +160,9 @@ const UserWidget = new Lang.Class({
         this._label = new UserWidgetLabel(user);
         this.actor.add_child(this._label);
 
+        this._label.bind_property('label-actor', this.actor, 'label-actor',
+                                  GObject.BindingFlags.SYNC_CREATE);
+
         this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUser));
         this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUser));
         this._updateUser();